Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Fri, 1 Jan 2010 19:30:06 +0000 (14:30 -0500)
committerEli Zaretskii <eliz@gnu.org>
Fri, 1 Jan 2010 19:30:06 +0000 (14:30 -0500)
commit01cb25b77901b1579def349e7346253b03dd0080
treefd13dd1736ba79a3cd8773ca9fd7f5a98c88afe6
parent5a071916991f54a39abdc24cc46b849a4df6bd35
parentc0ca123caa548811b32e5f710cf2269978f888b9
Merge from mainline.